summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam <byteslice@airmail.cc>2023-11-11 16:45:43 +0100
committerLiam <byteslice@airmail.cc>2023-11-11 16:45:43 +0100
commita6735cba5f6c7b9a7ad663686d99f8835ea000f6 (patch)
tree2314fd4a7680dfc8d825011118bbfc8e78e0741b
parentMerge pull request #11914 from liamwhite/newer-kpagetable (diff)
downloadyuzu-a6735cba5f6c7b9a7ad663686d99f8835ea000f6.tar
yuzu-a6735cba5f6c7b9a7ad663686d99f8835ea000f6.tar.gz
yuzu-a6735cba5f6c7b9a7ad663686d99f8835ea000f6.tar.bz2
yuzu-a6735cba5f6c7b9a7ad663686d99f8835ea000f6.tar.lz
yuzu-a6735cba5f6c7b9a7ad663686d99f8835ea000f6.tar.xz
yuzu-a6735cba5f6c7b9a7ad663686d99f8835ea000f6.tar.zst
yuzu-a6735cba5f6c7b9a7ad663686d99f8835ea000f6.zip
-rw-r--r--src/core/hle/kernel/k_capabilities.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/hle/kernel/k_capabilities.cpp b/src/core/hle/kernel/k_capabilities.cpp
index fb890f978..274fee493 100644
--- a/src/core/hle/kernel/k_capabilities.cpp
+++ b/src/core/hle/kernel/k_capabilities.cpp
@@ -5,6 +5,7 @@
#include "core/hle/kernel/k_capabilities.h"
#include "core/hle/kernel/k_memory_layout.h"
#include "core/hle/kernel/k_process_page_table.h"
+#include "core/hle/kernel/k_trace.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/svc_results.h"
#include "core/hle/kernel/svc_version.h"
@@ -329,6 +330,8 @@ Result KCapabilities::SetCapabilities(std::span<const u32> caps, KProcessPageTab
// Map the range.
R_TRY(this->MapRange_(cap, size_cap, page_table));
+ } else if (GetCapabilityType(cap) == CapabilityType::MapRegion && !IsKTraceEnabled) {
+ continue;
} else {
R_TRY(this->SetCapability(cap, set_flags, set_svc, page_table));
}